Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test new efit mappings for ida #257

Merged
merged 41 commits into from
Jun 28, 2024
Merged

Test new efit mappings for ida #257

merged 41 commits into from
Jun 28, 2024

Conversation

AreWeDreaming
Copy link
Collaborator

@AreWeDreaming AreWeDreaming commented Jul 27, 2023 •
edited
Loading

This should be merged after #255 and #256
This changes has three parts:

  • Changes to omas_imas to allow storing ODS data into IDS directly in memory
  • Added if_bandwidth to DIII-D ECE
  • Add mapping between flux coordinates from Extended magnetic mapping #222
  • Switched from obsolete b_r to b_field_r etc.

@AreWeDreaming
Extended magnetic mapping
f0e5394 
- This my crude attempt to allow mapping between
rho_pol_norm <-> rho_tor_norm
- This also includes phi
- I qualitatively tested rho_pol_norm -> rho_tor_norm
- Might have some COCOS issues
- Probably overly complicated
- Needs dynamic fetching of `phi` and `rho_pol_norm`
@AreWeDreaming
Fixed some horrible math errors from last commit
2f0e0b3 
- Tested against mapping form OMFITprofiles
- Results are OK by eye. Numerical verification still pending.
@AreWeDreaming
Fixed error in rho_tor to rho_pol conversion
a634444
@AreWeDreaming
Merged master into this branch
1d7ab5e
@AreWeDreaming
Fixed some bugs, but the result is still wrong
a35e79d
@AreWeDreaming
Fixed broken psi <-> conversion
df2cf6b 
- Results seem good now
@AreWeDreaming
Merge remote-tracking branch 'origin/master' into mapping_to_from_rho…
989b295 
…_tor_norm
@AreWeDreaming
Some changes that allow imas_set for ids objects
fbdd940
@AreWeDreaming
Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA
37fb8f0
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
ed3700f 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/imas_set_for_ids_objects' into t…
bae815f 
…est_new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
d0a7197 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
432a26b 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
97d4aba 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
537f900 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
a71f710 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
8bf84e6 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
b1df43a 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
a8c90d9 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
699ec70 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
1382e78 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
48371b6 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
8d958d7 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' int…
be1243f 
…o test_new_EFIT_mappings_for_IDA
@AreWeDreaming
Fixed missing raised exception
6b0bf16
@AreWeDreaming
Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' int…
ada7df0 
…o test_new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' int…
79fd988 
…o test_new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
3d43089 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_…
19204ba 
…new_EFIT_mappings_for_IDA
@AreWeDreaming
Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' int…
767e7b9 
…o test_new_EFIT_mappings_for_IDA
@github-actions
Copy link

Stale pull request message

@github-actions github-actions bot closed this Oct 22, 2023
@AreWeDreaming AreWeDreaming reopened this Dec 11, 2023
@AreWeDreaming
Copy link
Collaborator Author

Needs #256 to be merged first.

@AreWeDreaming
Copy link
Collaborator Author

Merged master into the branch in the hope of fixing regression.

@AreWeDreaming
Copy link
Collaborator Author

Merged master into branch trying to fix regression

@github-actions GitHub Actions
Copy link

Stale pull request message

@github-actions github-actions bot closed this Feb 19, 2024
@AreWeDreaming AreWeDreaming reopened this Jun 26, 2024
@AreWeDreaming AreWeDreaming assigned torrinba and unassigned torrinba Jun 26, 2024
@AreWeDreaming
Copy link
Collaborator Author

This should be ready to review and merge. Tests are passing to!

smithsp
smithsp approved these changes Jun 27, 2024
View reviewed changes
Copy link
Member

@smithsp smithsp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks ok to me.

@AreWeDreaming
Copy link
Collaborator Author

AreWeDreaming commented Jun 27, 2024 •
edited
Loading

@smithsp Should we create a PR with an OMAS update of OMFIT to this branch first or do we merge first?

@smithsp
Copy link
Member

smithsp commented Jun 27, 2024

Every commit to master branch of omas pushes a commit to auto_merge branch of OMFIT to update OMFIT's omas, which would trigger tests on that side.

@AreWeDreaming AreWeDreaming merged commit 3576817 into master Jun 28, 2024
6 checks passed
@AreWeDreaming AreWeDreaming deleted the test_new_EFIT_mappings_for_IDA branch June 28, 2024 00:18
@AreWeDreaming
Copy link
Collaborator Author

Well my test branch did pass some tests. Let's merge this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smithsp smithsp smithsp approved these changes

@orso82 orso82 Awaiting requested review from orso82

@torrinba torrinba Awaiting requested review from torrinba

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AreWeDreaming @smithsp @torrinba